Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch demo to use version 2 of the Docker registry #71

Merged
merged 1 commit into from
Oct 5, 2016

Conversation

jglick
Copy link
Member

@jglick jglick commented Oct 3, 2016

Mentioned in JENKINS-38018. We should be testing against the latest version of the Registry. This includes built-in SSL and authentication, so we do not need to proxy with nginx.

@reviewbybees

@@ -37,6 +37,9 @@ RUN /usr/local/maven/bin/mvn -s settings.xml -Dmaven.repo.local=/usr/share/jenki
COPY plugins.txt /tmp/files/
RUN /usr/local/bin/plugins.sh /tmp/files/plugins.txt

# Remove the base workflow-demo "cd" job
RUN rm -rf /usr/share/jenkins/ref/jobs/cd
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not belong in run-demo.sh to begin with.

build-proxy:
docker build -t nginx:docker-workflow-demo -f Dockerfile-proxy .
build-registry:
./gen-security-data.sh certs
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logically would belong in Dockerfile-registry, but the registry image does not seem to contain an openssl binary.

Alternately, could check in a static *.crt + *.key.

@ghost
Copy link

ghost commented Oct 4, 2016

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@stephenc
Copy link
Member

stephenc commented Oct 5, 2016

🐝 AIUI

@oleg-nenashev
Copy link
Member

🐝

@jglick jglick merged commit 77241fc into jenkinsci:master Oct 5, 2016
@jglick jglick deleted the registry-2 branch October 5, 2016 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants